Revert "kern: Include function name on debug and error print functions"

This reverts commit 894241c8543eb0dd27b16962a640f38e9b0c6e19.

Gbp-Pq: Name Revert-kern-Include-function-name-on-debug-and-error-prin.patch

diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
index ba04b57fb7ddcb2abbe38e38517e22d8dfa293fa..aebfe0cf8394f6a5061af84a7d3ab02452294703 100644 (file)
--- a/grub-core/kern/err.c
+++ b/grub-core/kern/err.c
@@ -38,14 +38,14 @@ static int grub_error_stack_assert;
 #endif
 
 grub_err_t
-grub_error (grub_err_t n, const char *file, const char *function, const int line, const char *fmt, ...)
+grub_error (grub_err_t n, const char *file, const int line, const char *fmt, ...)
 {
   va_list ap;
   int m;
 
   grub_errno = n;
 
-  m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%s:%d:", file, function, line);
+  m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, line);
   if (m < 0)
     m = 0;
 

diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 18c34b8eb1aab6c9f349492418a66f45c817b33a..91f44dea36415144cbe7f5667ee8717f0df9c247 100644 (file)
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -263,14 +263,14 @@ grub_debug_enabled (const char * condition)
 }
 
 void
-grub_real_dprintf (const char *file, const char *function, const int line, const char *condition,
+grub_real_dprintf (const char *file, const int line, const char *condition,
                   const char *fmt, ...)
 {
   va_list args;
 
   if (grub_debug_enabled (condition))
     {
-      grub_printf ("%s:%s:%d:%s: ", file, function, line, condition);
+      grub_printf ("%s:%d:%s: ", file, line, condition);
       va_start (args, fmt);
       grub_vprintf (fmt, args);
       va_end (args);

diff --git a/include/grub/err.h b/include/grub/err.h
index 99e757a808ee8c5fd7d961e1a0dd4634adada8a7..4b02d136a7b1785202efd35d0da81a14fb01e743 100644 (file)
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@ -89,10 +89,10 @@ struct grub_error_saved
 extern grub_err_t EXPORT_VAR(grub_errno);
 extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG];
 
-grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const char *function, const int line, const char *fmt, ...)
-       __attribute__ ((format (GNU_PRINTF, 5, 6)));
+grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const int line, const char *fmt, ...)
+       __attribute__ ((format (GNU_PRINTF, 4, 5)));
 
-#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
+#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
 
 void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_error_push) (void);

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 1bb63231a2e9e5dac8ca1831985674514301866f..62be0b9e17f399bc221409970c17565d7b4c40c3 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -35,7 +35,7 @@
 #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0]))
 #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
 
-#define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __FUNCTION__, __LINE__, condition, __VA_ARGS__)
+#define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, __VA_ARGS__)
 
 void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
 void *EXPORT_FUNC(grub_memcpy) (void *dest, const void *src, grub_size_t n);
@@ -407,10 +407,9 @@ grub_puts (const char *s)
 int EXPORT_FUNC(grub_puts_) (const char *s);
 int EXPORT_FUNC(grub_debug_enabled) (const char *condition);
 void EXPORT_FUNC(grub_real_dprintf) (const char *file,
-                                    const char *function,
                                      const int line,
                                      const char *condition,
-                                     const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 5, 6)));
+                                     const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 4, 5)));
 int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
 int EXPORT_FUNC(grub_printf_) (const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 1, 2)));
 int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args);